Merge from emacs-23; up to r100591.
authorGlenn Morris <rgm@gnu.org>
Sat, 4 Jun 2011 18:29:18 +0000 (11:29 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 4 Jun 2011 18:29:18 +0000 (11:29 -0700)
commit5ade5390e6901d168bc5e213f420840aa63fd489
tree665587f6ef0fdf52f11af41c861ed1642ea75318
parent17d5d167d14546db914040b6139d0520021e631e
parentb3a9a4b3f3ceb5638c8d9c5be1c22ce7ac8b4322
Merge from emacs-23; up to r100591.
src/ChangeLog
src/emacs.c
src/fringe.c